From b79972f1b707bc4f494853af1044bd23567c940f Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Sat, 1 Aug 2020 08:06:27 -0600
Subject: [PATCH] fix error detection for osx script, allow macOS sed for
 mkstyle. (#615)

---
 mkstyle.sh              | 6 ++++++
 tools/travis_script_osx | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mkstyle.sh b/mkstyle.sh
index 1471a7705..af821b0d1 100755
--- a/mkstyle.sh
+++ b/mkstyle.sh
@@ -16,6 +16,12 @@ if gsed v /dev/null 1>/dev/null 2>&1; then
 elif sed v /dev/null 1>/dev/null 2>&1; then
   # sed is gnu sed
   SED=sed
+elif [ "$(uname -s)" = "Darwin" ]; then
+  # BSD sed is usually fine, but if a style file is encoded in ISO-8859 then it
+  # can echo a warning "sed: RE error: illegal byte sequence" to stderr and the
+  # output can be corrupted, while return exit status 0.  Since we no longer use
+  # this encoding for style files allow Darwin's sed.
+  SED=/usr/bin/sed
 elif [ "$(uname -s)" = "FreeBSD" ]; then
   # BSD sed is fine
   SED=/usr/bin/sed
diff --git a/tools/travis_script_osx b/tools/travis_script_osx
index 98a3e2cbf..db91d4a55 100755
--- a/tools/travis_script_osx
+++ b/tools/travis_script_osx
@@ -14,11 +14,14 @@ VERSIONID=${VERSIONID:-$(date -ju -f %Y-%m-%dT%H:%M:%S%z $(git show -s --format=
 "$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"/ci_tokens
 
 # build and test the CLI
-$QMAKE GPSBabel.pro && make -j 2 && make check
+$QMAKE GPSBabel.pro
+make -j 3
+make check
 
 # build the GUI
 pushd gui
-$QMAKE app.pro && make -j 2
+$QMAKE app.pro
+make -j 3
 make package
 popd
 
@@ -29,4 +32,3 @@ hdiutil detach /Volumes/GPSBabelFE
 
 mv gui/GPSBabelFE.dmg gui/GPSBabel-${VERSIONID}.dmg
 
-
-- 
2.30.2